The on-wire names for the fields should be exactly as documented, including

case.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/libxen/src/xen_host.c b/tools/libxen/src/xen_host.c
index 0eb26e8cfedc538f26aecf098705baa88a3c0901..7e5600aed81c9618e4719f1c6147df22256bfd3a 100644 (file)
--- a/tools/libxen/src/xen_host.c
+++ b/tools/libxen/src/xen_host.c
@@ -52,13 +52,13 @@ static const struct_member xen_host_record_struct_members[] =
         { .key = "software_version",
           .type = &abstract_type_string_string_map,
           .offset = offsetof(xen_host_record, software_version) },
-        { .key = "resident_vms",
+        { .key = "resident_VMs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_host_record, resident_vms) },
-        { .key = "pifs",
+        { .key = "PIFs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_host_record, pifs) },
-        { .key = "host_cpus",
+        { .key = "host_CPUs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_host_record, host_cpus) }
     };

diff --git a/tools/libxen/src/xen_network.c b/tools/libxen/src/xen_network.c
index 4b336a10b29db628a0155b7dfe361d1738dda398..129617199f1b73c6cd3b7fbff66301b8947c1b38 100644 (file)
--- a/tools/libxen/src/xen_network.c
+++ b/tools/libxen/src/xen_network.c
@@ -47,10 +47,10 @@ static const struct_member xen_network_record_struct_members[] =
         { .key = "name_description",
           .type = &abstract_type_string,
           .offset = offsetof(xen_network_record, name_description) },
-        { .key = "vifs",
+        { .key = "VIFs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_network_record, vifs) },
-        { .key = "pifs",
+        { .key = "PIFs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_network_record, pifs) },
         { .key = "default_gateway",

diff --git a/tools/libxen/src/xen_pif.c b/tools/libxen/src/xen_pif.c
index 165b49e1bcad09038258b7959cdbcff311780540..92ca6508d109d5845b9a5b4f1ea3fae636ae7b57 100644 (file)
--- a/tools/libxen/src/xen_pif.c
+++ b/tools/libxen/src/xen_pif.c
@@ -50,13 +50,13 @@ static const struct_member xen_pif_record_struct_members[] =
         { .key = "host",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_pif_record, host) },
-        { .key = "mac",
+        { .key = "MAC",
           .type = &abstract_type_string,
           .offset = offsetof(xen_pif_record, mac) },
-        { .key = "mtu",
+        { .key = "MTU",
           .type = &abstract_type_int,
           .offset = offsetof(xen_pif_record, mtu) },
-        { .key = "vlan",
+        { .key = "VLAN",
           .type = &abstract_type_string,
           .offset = offsetof(xen_pif_record, vlan) },
         { .key = "io_read_kbs",

diff --git a/tools/libxen/src/xen_sr.c b/tools/libxen/src/xen_sr.c
index 4b3029bba4dae24807cdf5f4d8652f491874a060..0454e786f181a72cdaa673ed8c70e15d9bd1e5c2 100644 (file)
--- a/tools/libxen/src/xen_sr.c
+++ b/tools/libxen/src/xen_sr.c
@@ -46,7 +46,7 @@ static const struct_member xen_sr_record_struct_members[] =
         { .key = "name_description",
           .type = &abstract_type_string,
           .offset = offsetof(xen_sr_record, name_description) },
-        { .key = "vdis",
+        { .key = "VDIs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_sr_record, vdis) },
         { .key = "virtual_allocation",

diff --git a/tools/libxen/src/xen_vbd.c b/tools/libxen/src/xen_vbd.c
index f093bbffa932711b5959e9200a3d5efded06b2e8..228b60943d6116f23c9a0861a92828d7fac93ff3 100644 (file)
--- a/tools/libxen/src/xen_vbd.c
+++ b/tools/libxen/src/xen_vbd.c
@@ -43,10 +43,10 @@ static const struct_member xen_vbd_record_struct_members[] =
         { .key = "uuid",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vbd_record, uuid) },
-        { .key = "vm",
+        { .key = "VM",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_vbd_record, vm) },
-        { .key = "vdi",
+        { .key = "VDI",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_vbd_record, vdi) },
         { .key = "device",

diff --git a/tools/libxen/src/xen_vdi.c b/tools/libxen/src/xen_vdi.c
index 85f25e55104db45d2bebe5ae6b7b06c4e7e3ccc5..f3d2749d878f3e38a97b852f33a4ed07b2668c6d 100644 (file)
--- a/tools/libxen/src/xen_vdi.c
+++ b/tools/libxen/src/xen_vdi.c
@@ -48,10 +48,10 @@ static const struct_member xen_vdi_record_struct_members[] =
         { .key = "name_description",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vdi_record, name_description) },
-        { .key = "sr",
+        { .key = "SR",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_vdi_record, sr) },
-        { .key = "vbds",
+        { .key = "VBDs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_vdi_record, vbds) },
         { .key = "virtual_size",

diff --git a/tools/libxen/src/xen_vif.c b/tools/libxen/src/xen_vif.c
index 5d8df97e5db6484a927ddf5097949b1125df7e84..ac096a3cfd20f1d923240d7cc7ec0193e1313a1b 100644 (file)
--- a/tools/libxen/src/xen_vif.c
+++ b/tools/libxen/src/xen_vif.c
@@ -54,13 +54,13 @@ static const struct_member xen_vif_record_struct_members[] =
         { .key = "network",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_vif_record, network) },
-        { .key = "vm",
+        { .key = "VM",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_vif_record, vm) },
-        { .key = "mac",
+        { .key = "MAC",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vif_record, mac) },
-        { .key = "mtu",
+        { .key = "MTU",
           .type = &abstract_type_int,
           .offset = offsetof(xen_vif_record, mtu) },
         { .key = "io_read_kbs",

diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c
index 6ab0ca12cc8731b611ff60d673709705164d82b6..0f71313a94454ea59d648ecb34392dc76ebc2f11 100644 (file)
--- a/tools/libxen/src/xen_vm.c
+++ b/tools/libxen/src/xen_vm.c
@@ -120,19 +120,19 @@ static const struct_member xen_vm_record_struct_members[] =
         { .key = "actions_after_crash",
           .type = &xen_on_crash_behaviour_abstract_type_,
           .offset = offsetof(xen_vm_record, actions_after_crash) },
-        { .key = "vifs",
+        { .key = "VIFs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_vm_record, vifs) },
-        { .key = "vbds",
+        { .key = "VBDs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_vm_record, vbds) },
-        { .key = "vtpms",
+        { .key = "VTPMs",
           .type = &abstract_type_ref_set,
           .offset = offsetof(xen_vm_record, vtpms) },
         { .key = "bios_boot",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vm_record, bios_boot) },
-        { .key = "platform_std_vga",
+        { .key = "platform_std_VGA",
           .type = &abstract_type_bool,
           .offset = offsetof(xen_vm_record, platform_std_vga) },
         { .key = "platform_serial",
@@ -165,13 +165,13 @@ static const struct_member xen_vm_record_struct_members[] =
         { .key = "grub_cmdline",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vm_record, grub_cmdline) },
-        { .key = "pci_bus",
+        { .key = "PCI_bus",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vm_record, pci_bus) },
         { .key = "tools_version",
           .type = &abstract_type_string_string_map,
           .offset = offsetof(xen_vm_record, tools_version) },
-        { .key = "otherconfig",
+        { .key = "otherConfig",
           .type = &abstract_type_string_string_map,
           .offset = offsetof(xen_vm_record, otherconfig) }
     };

diff --git a/tools/libxen/src/xen_vtpm.c b/tools/libxen/src/xen_vtpm.c
index c5266b19d4d9179f38d22902528ea57c5a6a206a..75e90026f30d07a3a522dbfc91b3a47c2b46f179 100644 (file)
--- a/tools/libxen/src/xen_vtpm.c
+++ b/tools/libxen/src/xen_vtpm.c
@@ -42,7 +42,7 @@ static const struct_member xen_vtpm_record_struct_members[] =
         { .key = "uuid",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vtpm_record, uuid) },
-        { .key = "vm",
+        { .key = "VM",
           .type = &abstract_type_ref,
           .offset = offsetof(xen_vtpm_record, vm) },
         { .key = "backend",